summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockCobWeb.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Blocks/BlockCobWeb.h')
-rw-r--r--src/Blocks/BlockCobWeb.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/Blocks/BlockCobWeb.h b/src/Blocks/BlockCobWeb.h
index e7dd70af4..0c80edd2d 100644
--- a/src/Blocks/BlockCobWeb.h
+++ b/src/Blocks/BlockCobWeb.h
@@ -18,11 +18,27 @@ public:
{
}
- virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
+
+
+
+
+ virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
- a_Pickups.push_back(cItem(E_ITEM_STRING, 1, 0));
+ // Silk touch gives cobweb, anything else gives just string:
+ if (ToolHasSilkTouch(a_Tool))
+ {
+ return cItem(m_BlockType, 1, 0);
+ }
+ else
+ {
+ return cItem(E_ITEM_STRING, 1, 0);
+ }
}
+
+
+
+
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
{
UNUSED(a_Meta);